dash: Make sure we clear the timeout IDs for the label tooltip

https://bugzilla.gnome.org/show_bug.cgi?id=711732

diff --git a/js/ui/dash.js b/js/ui/dash.js
index 13651fa4c93a7bc0f2e1c3adeab7c0994a4a88ab..3c5e89d81a458f0748edf9279ed203c051735c91 100644 (file)
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -576,6 +576,7 @@ const Dash = new Lang.Class({
                     Lang.bind(this, function() {
                         this._labelShowing = true;
                         item.showLabel();
+                        this._showLabelTimeoutId = 0;
                         return false;
                     }));
                 if (this._resetHoverTimeoutId > 0) {
@@ -592,6 +593,7 @@ const Dash = new Lang.Class({
                 this._resetHoverTimeoutId = Mainloop.timeout_add(DASH_ITEM_HOVER_TIMEOUT,
                     Lang.bind(this, function() {
                         this._labelShowing = false;
+                        this._resetHoverTimeoutId = 0;
                         return false;
                     }));
             }